Merge branch 'master' into delsaplus

diff --cc gpsbabel.qrc
Simple merge

diff --cc reference/format0.txt
index 4121030e7e9925e595b6a96d620e402336cbf8ba,bab7cd80080bf086d5d6bb60b6337595afb09642..5d7899f1d6f93ea106f6dca23175209d0d79d849
--- 1/reference/format0.txt
--- 2/reference/format0.txt
+++ b/reference/format0.txt
@@@ -4,25 -4,15 +4,15 @@@ v900          Columbus/Visiontac V900 files (.c
  csv           Comma separated values
  iblue747      csv     Data Logger iBlue747 csv
  iblue757      csv     Data Logger iBlue757 csv
 -saplus                DeLorme Street Atlas Plus
 +gpl   gpl     DeLorme GPL
  saroute       anr     DeLorme Street Atlas Route
- destinator_itn        dat     Destinator Itineraries (.dat)
- destinator_poi        dat     Destinator Points of Interest (.dat)
- destinator_trl        dat     Destinator TrackLogs (.dat)
- easygps       loc     EasyGPS binary format
  exif  jpg     Embedded Exif-GPS data (.jpg)
- energympro    cpo     Energympro GPS training watch
- enigma        ert     Enigma binary waypoint file (.ert)
  shape shp     ESRI shapefile
- f90g  map     F90G Automobile DVR GPS log file
  igc           FAI/IGC Flight Recorder Data Format
  garmin_fit    fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- flysight      csv     FlySight GPS File
  gpssim        gpssim  Franson GPSGate Simulation
- fugawi        txt     Fugawi
  garmin301             Garmin 301 Custom position and heartrate
  garmin_g1000  csv     Garmin G1000 datalog input filter file
- glogbook      xml     Garmin Logbook XML
  gdb   gdb     Garmin MapSource - gdb
  garmin_txt    txt     Garmin MapSource - txt (tab delimited)
  garmin_poi            Garmin POI database

diff --cc reference/format1.txt
index 5788a3a324c9e5cfc3db8454c89f8d64c5b6fd09,26bee2d8d35fc14efd335d97445f46f811b6d2e5..87c5ebecc7433f4f834a6925e7b3c1e43f9aa6e5
--- 1/reference/format1.txt
--- 2/reference/format1.txt
+++ b/reference/format1.txt
@@@ -7,25 -7,15 +7,15 @@@ file  csv             Comma separated value
  internal      custom          Custom "Everything" Style
  file  iblue747        csv     Data Logger iBlue747 csv
  file  iblue757        csv     Data Logger iBlue757 csv
 -file  saplus          DeLorme Street Atlas Plus
 +file  gpl     gpl     DeLorme GPL
  file  saroute anr     DeLorme Street Atlas Route
- file  destinator_itn  dat     Destinator Itineraries (.dat)
- file  destinator_poi  dat     Destinator Points of Interest (.dat)
- file  destinator_trl  dat     Destinator TrackLogs (.dat)
- file  easygps loc     EasyGPS binary format
  file  exif    jpg     Embedded Exif-GPS data (.jpg)
- file  energympro      cpo     Energympro GPS training watch
- file  enigma  ert     Enigma binary waypoint file (.ert)
  file  shape   shp     ESRI shapefile
- file  f90g    map     F90G Automobile DVR GPS log file
  file  igc             FAI/IGC Flight Recorder Data Format
  file  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- file  flysight        csv     FlySight GPS File
  file  gpssim  gpssim  Franson GPSGate Simulation
- file  fugawi  txt     Fugawi
  file  garmin301               Garmin 301 Custom position and heartrate
  file  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  glogbook        xml     Garmin Logbook XML
  file  gdb     gdb     Garmin MapSource - gdb
  file  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  garmin_poi              Garmin POI database

diff --cc reference/format2.txt
index 6dfed0900e132706e3e7d4c15b0347d844dbfbc4,ad23fc941ea5d6a5847edf96842520e6e243f81a..28203ea4e75b66c0acf5da133d00ed48ed1b5a1c
--- 1/reference/format2.txt
--- 2/reference/format2.txt
+++ b/reference/format2.txt
@@@ -7,25 -7,15 +7,15 @@@ file  rw----  csv             Comma separated value
  internal      rw----  custom          Custom "Everything" Style
  file  --rw--  iblue747        csv     Data Logger iBlue747 csv
  file  --rw--  iblue757        csv     Data Logger iBlue757 csv
 -file  rw----  saplus          DeLorme Street Atlas Plus
 +file  --rw--  gpl     gpl     DeLorme GPL
  file  --r---  saroute anr     DeLorme Street Atlas Route
- file  ----rw  destinator_itn  dat     Destinator Itineraries (.dat)
- file  rw----  destinator_poi  dat     Destinator Points of Interest (.dat)
- file  --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)
- file  rw----  easygps loc     EasyGPS binary format
  file  rw----  exif    jpg     Embedded Exif-GPS data (.jpg)
- file  --r---  energympro      cpo     Energympro GPS training watch
- file  ----rw  enigma  ert     Enigma binary waypoint file (.ert)
  file  rwrwrw  shape   shp     ESRI shapefile
- file  --r---  f90g    map     F90G Automobile DVR GPS log file
  file  --rwrw  igc             FAI/IGC Flight Recorder Data Format
  file  -wrw--  garmin_fit      fit     Flexible and Interoperable Data Transfer (FIT) Activity file
- file  rw----  flysight        csv     FlySight GPS File
  file  -w-w-w  gpssim  gpssim  Franson GPSGate Simulation
- file  rw----  fugawi  txt     Fugawi
  file  rw----  garmin301               Garmin 301 Custom position and heartrate
  file  --rw--  garmin_g1000    csv     Garmin G1000 datalog input filter file
- file  --rw--  glogbook        xml     Garmin Logbook XML
  file  rwrwrw  gdb     gdb     Garmin MapSource - gdb
  file  rwrwrw  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
  file  rw----  garmin_poi              Garmin POI database

diff --cc reference/format3.txt
index 1112f52568cfb2c3fb6a7e761e46eda3a4400dd1,c59e776a8afaa74529ab5eb820e9415591360aa3..ea43856b8596653cc8f0dcfc3aa9de421074f456
--- 1/reference/format3.txt
--- 2/reference/format3.txt
+++ b/reference/format3.txt
@@@ -116,8 -116,22 +116,9 @@@ option    iblue757        prefer_shortnames       Use s
  
  option        iblue757        datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_datum
  
 -file  rw----  saplus          DeLorme Street Atlas Plus       xcsv
 -      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html
 -option        saplus  snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snlen
 -
 -option        saplus  snwhite Allow whitespace synth. shortnames      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snwhite
 -
 -option        saplus  snupper UPPERCASE synth. shortnames     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snupper
 -
 -option        saplus  snunique        Make synth. shortnames unique   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snunique
 -
 -option        saplus  urlbase Basename prepended to URL on output     string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_urlbase
 -
 -option        saplus  prefer_shortnames       Use shortname instead of description    boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_prefer_shortnames
 -
 -option        saplus  datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_datum
 +file  --rw--  gpl     gpl     DeLorme GPL     gpl
 +      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpl.html
+ 
  file  --r---  saroute anr     DeLorme Street Atlas Route      saroute
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html
  option        saroute turns_important Keep turns if simplify filter is used   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_important

diff --cc reference/help.txt
index 2abf4603459b4671c52446318324ecc3f71f799d,adf3199638375737c3e8042f65738309f5386b5e..eaad6737269ab06148f664afb50be8367179acf9
--- 1/reference/help.txt
--- 2/reference/help.txt
+++ b/reference/help.txt
@@@ -66,7 -66,14 +66,7 @@@ File Types (-i and -o options)
          urlbase               Basename prepended to URL on output 
          prefer_shortnames     (0/1) Use shortname instead of description 
          datum                 GPS datum (def. WGS 84) 
-         gpl                   DeLorme GPL
 -      saplus                DeLorme Street Atlas Plus
 -        snlen                 Max synthesized shortname length 
 -        snwhite               (0/1) Allow whitespace synth. shortnames 
 -        snupper               (0/1) UPPERCASE synth. shortnames 
 -        snunique              (0/1) Make synth. shortnames unique 
 -        urlbase               Basename prepended to URL on output 
 -        prefer_shortnames     (0/1) Use shortname instead of description 
 -        datum                 GPS datum (def. WGS 84) 
++  gpl                   DeLorme GPL
        saroute               DeLorme Street Atlas Route
          turns_important       (0/1) Keep turns if simplify filter is used 
          turns_only            (0/1) Only read turns; skip all other points 

diff --cc tools/nuke_format
index ee010699f2a35d09c68845f51bd33fdbc2e2d99b,25f58a038eb8f9079fdd16a865eca398045a3d1f..05650a07b0154c3fa349ac6b1ac138c97590b3b5
--- 1/tools/nuke_format
--- 2/tools/nuke_format
+++ b/tools/nuke_format
@@@ -27,9 -27,10 +27,10 @@@ remove_manually() 
  
  remove_line $1.cc CMakeLists.txt
  remove_line $1.h CMakeLists.txt
+ remove_line $1 CMakeLists.txt # for tests.
  remove_line $1.cc GPSBabel.pro
  remove_line $1.h GPSBabel.pro
 -remove_line $1.h gpsbabel.qrc
 +remove_line $1 gpsbabel.qrc
  
  remove_manually $1 reference/help.txt
  remove_manually $1 reference/format3.txt